Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update BRCM KNET modules to support new psample definitions from sflow… #11709

Merged
merged 3 commits into from
Aug 16, 2022
Merged

Update BRCM KNET modules to support new psample definitions from sflow… #11709

merged 3 commits into from
Aug 16, 2022

Conversation

michaelli10
Copy link
Contributor

@michaelli10 michaelli10 commented Aug 11, 2022 •
edited
Loading

What I did

Update BRCM KNET modules to support new psample definitions from sflow dropmon feature

Why I did it

BRCM KNET build was failing after changes in sflow dropmon feature PR284). References to psample were updated in the sflow dropmon feature and needs to be updated in BRCM KNET modules.

How I did it

  • Remove KNET module psample (use Linux kernel psample instead)
  • Make changes in KNET sflow psample code to reflect new psample function definition
  • Advance sonic-linux-kernel submodule to get sflow dropmon feature in PR284.
  • Advance saibcm-modules-dnx to pickup changes in PR10.

Commits included in #11709

f015a8b [sflow_dropmon_knet] Update BRCM KNET modules to support new psample definitions from sflow + dropmon feature (#11709)
0298b4a [sflow_dropmon_knet] Advance saibcm-modules-dnx (#11709)
12f5c81 [sflow_dropmon_knet] Advance sonic-linux-kernel (#11709)

@michaelli10 michaelli10 requested a review from lguohan as a code owner August 11, 2022 23:25
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 11, 2022 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: michaelli10 / name: Michael Li (f015a8b)

@saiarcot895
Copy link
Contributor

The changes in this PR should go in with a sonic-linux-kernel submodule update.

@saiarcot895
Copy link
Contributor

Could you update the PR description to include the individual commits in the sonic-linux-kernel submodule update?

@michaelli10
Copy link
Contributor Author

Could you update the PR description to include the individual commits in the sonic-linux-kernel submodule update?

I updated the commit ID for the 2 items describing the advancement of sonic-linux-kernel and saibcm-module submodules in the PR description.

Advance sonic-linux-kernel submodule to get sflow dropmon feature in sonic-net/sonic-linux-kernel#284. Commit 12f5c81
Advance saibcm-modules-dnx to pickup changes in sonic-net/saibcm-modules#10. Commit 0298b4a

@saiarcot895
Copy link
Contributor

saiarcot895 commented Aug 15, 2022 •
edited
Loading

I meant something like this:

fdd9bac [Mellanox] Add new kernel patches from HW-MGMT package V.7.0020.3005 (#287)
50e2bff [patch] mlxsw: i2c: Prevent transaction execution for special chip (#279)
fa9411d [sflow + dropmon] added missing patch for the sFlow + dropmon feature. (#281)
1f83896 [sflow + dropmon] added patches for the sFlow + dropmon feature. (#276)

Technically, there's more than one commit from the repo being brought in.

@michaelli10
Copy link
Contributor Author

@saiarcot895 added references to the 3 commits in the PR description. Let me know if any other info is needed.

This was referenced Aug 16, 2022
Closed
Closed
@saiarcot895 saiarcot895 merged commit 055b7d5 into sonic-net:master Aug 16, 2022
@yxieca yxieca mentioned this pull request Aug 29, 2022
Merged
yxieca pushed a commit to yxieca/sonic-buildimage that referenced this pull request Aug 31, 2022
@michaelli10 @yxieca
Update BRCM KNET modules to support new psample definitions from sflo…
1dc7a85 
…w… (sonic-net#11709)

* Update BRCM KNET module to support new psample definitions from sflow dropmon feature

* Update BRCM KNET module to support new psample definitions from sflow dropmon feature

* Advance saibcm-modules-dnx
yxieca added a commit that referenced this pull request Aug 31, 2022
@yxieca @michaelli10
[202205] Update BRCM KNET modules to support new psample definitions …
875328b 
…from sflow (#11890)

* [202205][linux-kernel] advance submodule head

linux-kernel:
* 3fe00d4 2022-06-24 | [sflow + dropmon] added missing patch for the sFlow + dropmon feature. (#281) (HEAD -> 202205) [Vadym Hlushko]
* ca727d6 2022-04-21 | [sflow + dropmon] added patches for the sFlow + dropmon feature. (#276) [Vadym Hlushko]

Signed-off-by: Ying Xie <[email protected]>

* Update BRCM KNET modules to support new psample definitions from sflow… (#11709)

* Update BRCM KNET module to support new psample definitions from sflow dropmon feature

* Update BRCM KNET module to support new psample definitions from sflow dropmon feature

* Advance saibcm-modules-dnx

Signed-off-by: Ying Xie <[email protected]>
Co-authored-by: Michael Li <[email protected]>
@michaelli10 michaelli10 deleted the sflow_dropmon_knet branch November 22, 2022 22:42
@michaelli10 michaelli10 mentioned this pull request Oct 18, 2023
Merged
11 tasks
Gfrom2016 added a commit to Gfrom2016/sonic-buildimage that referenced this pull request Oct 19, 2023
@Gfrom2016
Honor sonic-net#11709 changes
fc68eea 
Signed-off-by: zitingguo-ms <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saiarcot895 saiarcot895 saiarcot895 approved these changes

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
Included in 202205 Branch Request for 202205 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@michaelli10 @saiarcot895 @yxieca